Revert 41a6ea3..da1c5eb

This rolls back to commit 41a6ea30aaef86a3fb4cac854018b5c239016e97.