Revert 6c7be87..042afcf

This rolls back to commit 6c7be87550b24dbdf5469007a92b7e7c73b809ed.