Revert 582e58c..fcf60fb

This rolls back to commit 582e58c39b0eb04bff438e8a479370a2c4902b51.