Revert 81c7843..2ff684d

This rolls back to commit 81c78432578eb3bca78c3d98aaf3e9bd4fef098d.