Revert 379a508..09f2db5

This rolls back to commit 379a50859fc898412c56cbed9cf532e4a45f5a4b.