Revert ed0b5f5..23b38c8

This rolls back to commit ed0b5f5fa9d9f216b80f5a231be3075c86327ce6.