Revert 7f04b9a..5739021

This rolls back to commit 7f04b9a0934ca0f964f1b41676ad5605ccebe61e.