Revert c5c5ee4..8666b4f

This rolls back to commit c5c5ee41f83a3104f44a68029b80489140f381df.