Revert 244283f..11886f4

This rolls back to commit 244283f7ee62665d3a8a8b6087710f6ce9fa5f44.