Revert 9fc3ee0..2468809

This rolls back to commit 9fc3ee007e91fc2367cb8ecfcf028dbab3afa04d.