Revert "Roll back bugged commit."

This reverts commit 9d63c78ff047872fcf08be57b548e28f8d8b48ef.