Revert bf81efa..3c511bb

This rolls back to commit bf81efadf9b9f474b55b6294f1bca728c3b49ef6.