Revert 4cead08..d50b592

This rolls back to commit 4cead08ae749515bee61ec9b0f1380ea5474ec92.