Revert f2ca13b..0bc077b

This rolls back to commit f2ca13b2b38264203934f795c4b8367faa787c4a.
rollback