Revert 5e8e6e7..829d801

This rolls back to commit 5e8e6e744b2c21e2bb02eb44192c844f5adadf18.