Revert 21747b1..859c64c

This rolls back to commit 21747b1a94ad0fe696dadcfe3dc0590ca67f552d.