Revert 8ae5d27..c865bb1

This rolls back to commit 8ae5d2745c25514bef4861a94d4c2d97f823ba1e.