Revert 877e553..dd50473

This rolls back to commit 877e5534fb0264553d681a38e22d374f24b18cb5.