Revert 0bba87c..729460e

This rolls back to commit 0bba87c8d94e3059c0562964efc73be63e931239.