Revert 1eb9da6..c61d600

This rolls back to commit 1eb9da6b4a41c06d27de9f65cd48942716043d33.