Revert c972a40..be26a9e

This rolls back to commit c972a40f280034d8eeb64bce8fc7b538a6ea8b2f.