Revert 5ba4552..28dbe18

This rolls back to commit 5ba4552547905c5e6b5c634ddf6fa290f57bf5c1.