Revert 2ae4c24..968d21e

This rolls back to commit 2ae4c24b88dffeb97b1a5e81804ecf3376cbb7de.