Revert 642666d..d4b42db

This rolls back to commit 642666db5c75972d75ac4cb381fd5ac907911de5.