Revert 7173e24..99b3eb5

This rolls back to commit 7173e248c93b0ed8798ad9b5bdc6d6414953459c.