Revert 15e7c1e..8de7306

This rolls back to commit 15e7c1e8d31e8661a77100e2b92e5f70782384ed.