Revert a56374a..c0c50f3

This rolls back to commit a56374a25c51b6f8f8161e7ac420609c44c457f7.