Revert 56d9d91..2c7b0f2

This rolls back to commit 56d9d91de08c943303a7b481fe2ecb6bba68fbef.