Revert c217ccd..6ea9cf4

This rolls back to commit c217ccd7211557c0eae4da2223eb13d75e8235f7.