Revert 90fa64c..8727c5e

This rolls back to commit 90fa64c25c25d2be3d7fc55d603fee7e1fc2ec12.