Revert 15b3aff..17c81ef

This rolls back to commit 15b3affed6f76c8c6da38fe0b1f9ace5c6b79cb2.