Revert 1fcb9d5..8774f91

This rolls back to commit 1fcb9d5b248fe17c5103f37c0093a3b6d5ea5105.