Revert 3e57027..cde9c96

This rolls back to commit 3e57027407a76b2cdbeef695c3577cf93de1c9df.