Revert be6dfd1..78852b3

This rolls back to commit be6dfd19877a5545a1f837733e60d956cbe688ed.