Revert 75622a3..a644ce1

This rolls back to commit 75622a377853664584b27b8a549730e6bde1220f.