Revert 9f29816..575a114

This rolls back to commit 9f2981627e47e3a12d85629748ab7543f28e70e2.