Revert 4a95f0c..844ee5c

This rolls back to commit 4a95f0cf756119372f851aafd814a28f4c742f67.