Revert 49f7dff..1c90c26

This rolls back to commit 49f7dffe1de14539db0f7eea102dd99be747f1b0.