Revert b80cdac..bcc7445

This rolls back to commit b80cdac6c554102f00d8cf5834f8587cd489ea8e.
To the rescue - hide