Revert 10e5296..e31ab95

This rolls back to commit 10e529654780b5a6c243a7bf3ad3c4d1abfa867d.