Reverted change accidentally introduced in the previous commit. A proper fix needs to be found for this one.