Revert 74ea389..16a74ce

This rolls back to commit 74ea389ccaca88a814e2b699871609fad11f2407.