Revert ad1dcfc..cb301bf

This rolls back to commit ad1dcfc8be381829f0cb290d8ca1a3c6939bc756.