Revert 5d20258..f0e1e56

This rolls back to commit 5d20258267dfb7afb75859976f7e066ed4ef32c2.