Revert fcbd0c0..72c8c58

This rolls back to commit fcbd0c092291bfda1518d321a65a8fb4c492d72f.