Revert bf57c1a..2410e8c

This rolls back to commit bf57c1a34b396cdfc4a21498678aaf2fc2cd66f2.
Test