Revert 5a9ceae..9718132

This rolls back to commit 5a9ceaee7b44bb6c1e3e4a267eaedfbb751fcb7a.