Revert 54b188e..0aaec19

This rolls back to commit 54b188e01f5a78eac0d380198228ce09d360b20d.