Revert 557be7d..57dd278

This rolls back to commit 557be7d1b802f50ae9d9e6b480c1aa2d43f84700.