Revert 37fdb85..f7b94bf

This rolls back to commit 37fdb8521ebf343e8c3aead98822a7824c322a86.