Revert 07f2c89..fecea1f

This rolls back to commit 07f2c890e9534408ea466e5d51ec51f974f25376.