Revert 22f6e2f..7d4624e

This rolls back to commit 22f6e2fd213b645035de5e0a4089b9aac7abb9e5.