Revert da53eef..cb1e14b

This rolls back to commit da53eef07eb3e809653ed568d108d26ae80f22d2.