Revert 77544e9..fdadbc0

This rolls back to commit 77544e90ae02ca39af8a1d65a528a8f49f94301b.