Revert 72d2801..cf0a58c

This rolls back to commit 72d2801b6864ce52c660d6bd8897d40d6f2d2d2e.
Commit