Revert f48cfdb..251a544

This rolls back to commit f48cfdb77324f334d7b146f02e9f4fe43261b324.