Revert ab0bee2..6b38e7b

This rolls back to commit ab0bee2fef84df707f18c6e4ef76c4c3ac6f1b15.