Revert 4d1c613..1e9e4e6

This rolls back to commit 4d1c6131fb318f8f7106d756db22b14b10a4dfaa.