Revert 3f35473..04c2347

This rolls back to commit 3f35473f4301dd774dd7718b8a800a93d9095e09.