Revert fb2445e..54468b1

This rolls back to commit fb2445e8262c84cf0fa1ffe4f7bd258eecdff048.