Revert 3d02c17..deec94c

This rolls back to commit 3d02c176c7d7eb100861dbcb9c3947f7dea3eb27.