Revert 408aa79..302227b

This rolls back to commit 408aa791cfcbfef4b3479c93c2cc1c0166391ddd.
?