Revert 2fa55d3..5e0df12

This rolls back to commit 2fa55d39114096e6c32c3a2cf7045f50eb4fe6c5.