Revert dbb8564..b66bbcb

This rolls back to commit dbb8564446c442dfb34a70fbe9aa0af91765707a.