Revert 03950ca..002e3b0

This rolls back to commit 03950cac597c5f99442281f46e57e32e61bea328.