Revert 45b27f1..cbb6638

This rolls back to commit 45b27f13c22c95a93ed365409044cdb1e15234b0.