Revert 68f4a3e..7e99c67

This rolls back to commit 68f4a3e21f41552948d3e12d26d6ea37c2f07e32.