Revert 3090251..b9eb7c8

This rolls back to commit 3090251323915a719bc5e0c2e5ac7f696fccb7e8.