Revert f062be9..579fa2b

This rolls back to commit f062be9af6234a67df1f88d607b482ac858247c3.