Revert 4ddce61..3a704e1

This rolls back to commit 4ddce612767bcea87391228c6f8474cdc407eb29.