Revert 5bb8d69..2763ac5

This rolls back to commit 5bb8d69bd58ef08868607c2e47a8549645d9d480.