Revert 4bda303..89ef635

This rolls back to commit 4bda303a8eb22155edaf6a7c954043a4e9deb05b.